Fix a problem in WoMan that caused it to fail for some manpages.

diff --git a/debian/changelog b/debian/changelog
index c597f54a03ca25d9511511c5ed6b8a59a0553d6f..9f7d04a6f21382d4e077ad780eaad963145ce333 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,10 @@ emacs22 (22.2+2-3) unstable; urgency=medium
     "Bernhard Michler" <Boregard@gmx.net> for the report and Sven Joachim
     <svenjoac@gmx.de> for the fix. (closes: #478240)
 
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 23 Jul 2008 20:32:25 -0700
+  * Fix a problem in WoMan which caused it to raise an error for a number
+    of manpages.  Thanks to Sven Joachim <svenjoac@gmx.de>. (closes: #476223)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 23 Jul 2008 20:56:33 -0700
 
 emacs22 (22.2+2-2) unstable; urgency=medium
 

diff --git a/debian/patches/fix-woman2-th.diff b/debian/patches/fix-woman2-th.diff
new file mode 100644 (file)
index 0000000..c8e3f19
--- /dev/null
+++ b/debian/patches/fix-woman2-th.diff
@@ -0,0 +1,27 @@
+* WoMan should now handle various manpages without raising an error.
+  Patch: fix-woman2-th.diff
+  Provided-by: Sven Joachim <svenjoac@gmx.de>
+  Date: Tue, 15 Apr 2008 09:42:31 +0200
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Status: incorporated upstream
+
+  WoMan should now correctly handle a number of manpages which
+  previously caused it to raise an error.
+
+Index: sid/lisp/woman.el
+===================================================================
+--- sid.orig/lisp/woman.el
++++ sid/lisp/woman.el
+@@ -3810,10 +3810,9 @@
+       (insert " -- ")
+       (woman-forward-arg 'unquote 'concat)
+       ;; Delete repeated arguments:
+-      (if (string-match (buffer-substring here (point))
++      (if (string-equal (buffer-substring here (point))
+                       (buffer-substring start here))
+-        (delete-region here (point)))
+-      ))
++        (delete-region here (point)))))
+   ;; Embolden heading (point is at end of heading):
+   (woman-set-face
+    (save-excursion (beginning-of-line) (point)) (point) 'woman-bold)

diff --git a/debian/patches/series b/debian/patches/series
index 5b7c5e77b6a30d15ecf1282acc5f9053c02688fe..232839f5b5160ef37072d3a4466d264f7ff43b95 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,5 @@ fix-vcdiff-tmp-file-handling-cve-2008-1694.diff
 make-fast-lock-cache-directories-risky-cve-2008-2142.diff
 fix-mule-select-safe-coding.diff
 look-for-news-to-find-etc.diff
+fix-woman2-th.diff
 autofiles.diff